Rename gpsbabel.doc-base parts to stop confusing dh_installdocs.

diff --git a/debian/gpsbabel.doc-base-common b/debian/gpsbabel.doc-base-common
new file mode 100644 (file)
index 0000000..9a5224a
--- /dev/null
+++ b/debian/gpsbabel.doc-base-common
@@ -0,0 +1,8 @@
+Document: gpsbabel
+Title: gpsbabel filter and format documentation
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/gpsbabel/htmldoc/index.html
+Files: /usr/share/doc/gpsbabel/htmldoc/*.html
+

diff --git a/debian/gpsbabel.doc-base-pdf b/debian/gpsbabel.doc-base-pdf
new file mode 100644 (file)
index 0000000..c2544cd
--- /dev/null
+++ b/debian/gpsbabel.doc-base-pdf
@@ -0,0 +1,3 @@
+Format: PDF
+Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz
+

diff --git a/debian/gpsbabel.doc-base.common b/debian/gpsbabel.doc-base.common
deleted file mode 100644 (file)
index 9a5224a..0000000
--- a/debian/gpsbabel.doc-base.common
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: gpsbabel
-Title: gpsbabel filter and format documentation
-Section: Science/Geoscience
-
-Format: HTML
-Index: /usr/share/doc/gpsbabel/htmldoc/index.html
-Files: /usr/share/doc/gpsbabel/htmldoc/*.html
-

diff --git a/debian/gpsbabel.doc-base.pdf b/debian/gpsbabel.doc-base.pdf
deleted file mode 100644 (file)
index c2544cd..0000000
--- a/debian/gpsbabel.doc-base.pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-Format: PDF
-Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz
-

diff --git a/debian/rules b/debian/rules
index ae095a787dd4eedb8644e8c0481fb1c6556db909..8f3be076cf507fc15003024bd3fd491cb039f332 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -76,12 +76,12 @@ build-stamp: configure-stamp
 
 build-doc-stamp: configure-stamp
        $(MAKE) $(DOCTEMP)/htmldoc-devel/index.html WEB=$(DOCTEMP) DOCVERSION=devel
-       cp $(CURDIR)/debian/gpsbabel.doc-base.common $(CURDIR)/debian/gpsbabel.doc-base
+       cp $(CURDIR)/debian/gpsbabel.doc-base-common $(CURDIR)/debian/gpsbabel.doc-base
 ifneq (mips,$(HOSTARCH))
        $(MAKE) gpsbabel.pdf WEB=$(DOCTEMP) DOCVERSION=devel
        rm -f $(CURDIR)/$(DOCTEMP)/htmldoc-devel/gpsbabel-$(DOCVERSION).pdf DOCVERSION=devel
        cp gpsbabel.pdf $(CURDIR)/$(DOCTEMP)
-       cat $(CURDIR)/debian/gpsbabel.doc-base.pdf >> $(CURDIR)/debian/gpsbabel.doc-base
+       cat $(CURDIR)/debian/gpsbabel.doc-base-pdf >> $(CURDIR)/debian/gpsbabel.doc-base
 endif
        touch $@